From 88ee7951d3d979f15c5b40689d140e61b1c63fb3 Mon Sep 17 00:00:00 2001 From: "cl349@freefall.cl.cam.ac.uk" Date: Wed, 8 Sep 2004 16:38:13 +0000 Subject: [PATCH] bitkeeper revision 1.1159.1.138 (413f3575zU7tYDi_ptlg-r1nAnN1Ww) Reset PAGE_OFFSET to 0xc0100000 and use VIRT_BASE=0xc0000000. --- .rootkeys | 1 - .../arch/xen/i386/kernel/head.S | 2 +- .../include/asm-xen/asm-i386/e820.h | 40 ------------------- .../include/asm-xen/asm-i386/page.h | 4 +- .../include/asm-xen/asm-i386/processor.h | 11 +++-- 5 files changed, 11 insertions(+), 47 deletions(-) delete mode 100644 linux-2.6.8.1-xen-sparse/include/asm-xen/asm-i386/e820.h diff --git a/.rootkeys b/.rootkeys index 95f12c9ec5..1299c323ba 100644 --- a/.rootkeys +++ b/.rootkeys @@ -209,7 +209,6 @@ 412f47e4RKD-R5IS5gEXvcT8L4v8gA linux-2.6.8.1-xen-sparse/include/asm-generic/pgtable.h 40f56239YAjS52QG2FIAQpHDZAdGHg linux-2.6.8.1-xen-sparse/include/asm-xen/asm-i386/desc.h 4107adf1E5O4ztGHNGMzCCNhcvqNow linux-2.6.8.1-xen-sparse/include/asm-xen/asm-i386/dma-mapping.h -40f5623anSzpuEHgiNmQ56fIRfCoaQ linux-2.6.8.1-xen-sparse/include/asm-xen/asm-i386/e820.h 40f5623akIoBsQ3KxSB2kufkbgONXQ linux-2.6.8.1-xen-sparse/include/asm-xen/asm-i386/fixmap.h 4118b6a418gnL6AZsTdglC92YGqYTg linux-2.6.8.1-xen-sparse/include/asm-xen/asm-i386/highmem.h 40f5623aJVXQwpJMOLE99XgvGsfQ8Q linux-2.6.8.1-xen-sparse/include/asm-xen/asm-i386/io.h diff --git a/linux-2.6.8.1-xen-sparse/arch/xen/i386/kernel/head.S b/linux-2.6.8.1-xen-sparse/arch/xen/i386/kernel/head.S index be45eec5c4..e67c5b3ea0 100644 --- a/linux-2.6.8.1-xen-sparse/arch/xen/i386/kernel/head.S +++ b/linux-2.6.8.1-xen-sparse/arch/xen/i386/kernel/head.S @@ -2,7 +2,7 @@ #include .section __xen_guest - .ascii "GUEST_OS=linux,GUEST_VER=2.6,XEN_VER=2.0" + .ascii "GUEST_OS=linux,GUEST_VER=2.6,XEN_VER=2.0,VIRT_BASE=0xC0000000" .ascii ",LOADER=generic" #ifdef CONFIG_XEN_WRITABLE_PAGETABLES .ascii ",PT_MODE_WRITABLE" diff --git a/linux-2.6.8.1-xen-sparse/include/asm-xen/asm-i386/e820.h b/linux-2.6.8.1-xen-sparse/include/asm-xen/asm-i386/e820.h deleted file mode 100644 index c4cae27f8e..0000000000 --- a/linux-2.6.8.1-xen-sparse/include/asm-xen/asm-i386/e820.h +++ /dev/null @@ -1,40 +0,0 @@ -/* - * structures and definitions for the int 15, ax=e820 memory map - * scheme. - * - * In a nutshell, arch/i386/boot/setup.S populates a scratch table - * in the empty_zero_block that contains a list of usable address/size - * duples. In arch/i386/kernel/setup.c, this information is - * transferred into the e820map, and in arch/i386/mm/init.c, that - * new information is used to mark pages reserved or not. - * - */ -#ifndef __E820_HEADER -#define __E820_HEADER - -#define E820MAP 0x2d0 /* our map */ -#define E820MAX 32 /* number of entries in E820MAP */ -#define E820NR 0x1e8 /* # entries in E820MAP */ - -#define E820_RAM 1 -#define E820_RESERVED 2 -#define E820_ACPI 3 /* usable as RAM once ACPI tables have been read */ -#define E820_NVS 4 - -#define HIGH_MEMORY (0) - -#ifndef __ASSEMBLY__ - -struct e820map { - int nr_map; - struct e820entry { - unsigned long long addr; /* start of memory segment */ - unsigned long long size; /* size of memory segment */ - unsigned long type; /* type of memory segment */ - } map[E820MAX]; -}; - -extern struct e820map e820; -#endif/*!__ASSEMBLY__*/ - -#endif/*__E820_HEADER*/ diff --git a/linux-2.6.8.1-xen-sparse/include/asm-xen/asm-i386/page.h b/linux-2.6.8.1-xen-sparse/include/asm-xen/asm-i386/page.h index d299d7cd02..129c68f419 100644 --- a/linux-2.6.8.1-xen-sparse/include/asm-xen/asm-i386/page.h +++ b/linux-2.6.8.1-xen-sparse/include/asm-xen/asm-i386/page.h @@ -170,9 +170,9 @@ static __inline__ int get_order(unsigned long size) * change TASK_SIZE */ #ifdef __ASSEMBLY__ -#define __PAGE_OFFSET (0xC0100000) +#define __PAGE_OFFSET (0xC0000000) #else -#define __PAGE_OFFSET (0xC0100000UL) +#define __PAGE_OFFSET (0xC0000000UL) #endif diff --git a/linux-2.6.8.1-xen-sparse/include/asm-xen/asm-i386/processor.h b/linux-2.6.8.1-xen-sparse/include/asm-xen/asm-i386/processor.h index b8497743bb..0d1860fe6b 100644 --- a/linux-2.6.8.1-xen-sparse/include/asm-xen/asm-i386/processor.h +++ b/linux-2.6.8.1-xen-sparse/include/asm-xen/asm-i386/processor.h @@ -217,8 +217,13 @@ static inline void set_in_cr4 (unsigned long mask) case X86_CR4_OSXMMEXCPT: break; default: - printk("Xen unsupported cr4 update\n"); - BUG(); + do { + const char *msg = "Xen unsupported cr4 update\n"; + (void)HYPERVISOR_console_io( + CONSOLEIO_write, __builtin_strlen(msg), + (char *)msg); + BUG(); + } while (0); } } @@ -295,7 +300,7 @@ extern unsigned int mca_pentium_flag; /* * User space process size: 3GB (default). */ -#define TASK_SIZE (PAGE_OFFSET & PGDIR_MASK) +#define TASK_SIZE (PAGE_OFFSET) /* This decides where the kernel will search for a free chunk of vm * space during mmap's. -- 2.30.2